Patches I made to make life easier