Minor fixes, organized imports