Solved minor bugs