fixes based on updates