Fixes for lone else and elif