Resolved various non-compile errors