General fixes to solution