more fixes - thanks @kisom