Fixed faulty imports, updated build