More fixes

Signed-off-by: Hugo_the_Dwarf <edgaredward2010@gmail.com>