[Beach] Fixes