Fixes for https://github.com/olevole/cbsd/issues/25. Reported and fixed by: kev009
Fixes for https://github.com/olevole/cbsd/issues/25. Reported and fixed by: kev009

hongzhen/cbsd,cbsd/cbsd,hongzhen/cbsd,olevole/cbsd,olevole/cbsd,cbsd/cbsd,jnbek/cbsd,jnbek/cbsd,cbsd/cbsd,jnbek/cbsd,olevole/cbsd,cbsd/cbsd,hongzhen/cbsd,hongzhen/cbsd,jnbek/cbsd,olevole/cbsd