Fixing 2 hacks