Fixes and junk