Fixed imports and some warnings.