Lakes and Caves Conflict With New "Village & Pillage" Structures

The new structures can end up floating in the air and be overwritten by lakes and caves. Is this intentional and if not, can this be fixed? The feel and atmosphere of the new villages can end up being ruined by this current world generation.