Fixed minor bugs from previous