Fixing some issue pre-release