Misc. changes for further hacks