[BUG] Fixes for single page checkout