Fix some minor issues

Signed-off-by: Tony G <mipt.shootnick.spam@gmail.com>