Fixed minor general stuff