Add debug logs, fix return after create container