Fix some existing issues