A few bugs and additons from SMF