Start fixing problems with v04