Fail safe import fixes made by Antti