Resolve remaining compile issues