Fixes, thanking Martin Pelikan martin.pelikan@gmail.com