first fixes for new launcher