Fixed minor bugs after org code