Kevin/little fixes