Solved some amateur issues