Solution fixes