Minor prep work ready for homebrew