Fixed minor bugs from revamp