Tiny fix
Several fixes