various fixes for it to work on jamstall.n