Some fixes to solution