Last fixes for first release