More sexy fixes