Fix little mistakes (1.7 compatibility not done!)