fixes for simple mode