Fixes for continuous mode