Norminette issues fixed