syntax fixes for expansion