Small fixes. Better pre-defined locations.