Bug fixes attempted