Various small fixes, we secure now.