Just a few random hacks