Solution Fixes