DB/Felwood: Misc fixes