merged minor changes from recent project64