A few bug fixes - 4.4.1