Last try to fix remaining issues