Fixed issues with end-get, end-set and %Super