FIX minor fixes from kowey