Miscellaneous display build errors fixes