Fix file errors after class change