Some stop-gap tweaks