Resolved the issues I just raised