post-alpha fixes