Various hacks... DO NOT MERGE