These problems should be corrected as soon as possible, otherwise the undertaking may fail in the very beginning. I do not think that it is technically difficult for you to just do it right.