Aafix more stuff