* Fix a whole bunch of breaking crap and fail more gracefully