Fixes for pre-alpha