Fixed: logical type ***requested, but does not exist & cleanups