Fixed remaining template issues (for now)