Bug fixes based on solutions