Resolved a few more issues