Small fixes and empty sand override