Last fixes for upcoming release