Improvements and fixing a bug with disallowed