Fixed some buggy imports