Little fixes in prep for demo