Fixed minor dev bugs