Fix some compilation errors due to wrong imports