Minor fixes, solution maintenance