Whitespace and missing elements fixes