Some fixes

Should have used a unary operator