Fixed structural issues flagged by Bootlint.