Celeste: Fix a few