Some final pre-alpha fixes