More puzzle fixes