Got rid of those Internal(1) warnings