Fixes and Shit