Fix some NotImplementedExceptions