Last minute cleanups/hacks
No idea