last Fixes