Fixes for development branch