Fix errors of first command after init

Some commands conflicted with the init and were being run prematurely
and with the wrong buffers