Rejigger limitations slightly