Various hacks that make things work better - View it on GitHub