Small fixes in checkbox behaviour