Resolve compiler errors