Various updates for sync with kollkoll