updated: tweaks for initial k19 builds.