Last tweaks
Funny bug fix