Miscellaneous cleanup from @FlaPer87's root PR