Quick fixes and tests