some more chck in fixes