Fixes that slluis asked for.