Fixes for solution