Fixes to previous (Thanks Matthias)