Hacky Fixes for the AI