variable definition fixes