initial bugs from switchover