Fixed minor bugs..