Assorted fixes for recent upstream changes
Remove baselayout, custom version no longer needed
fix format