Fixes and other fancy things