Fixes and bogs