Fixes and import