Quick fixes and more #55