Fix these problems