More restrictions fixes