Minor fixes before going public