Fixed issues with missing unlocks/dependencies/debug checks for top level...

Fixed issues with missing unlocks/dependencies/debug checks for top level cells which aren't also super cells