Fixed some issues with imports and lib integration