minor fixes in OBANYC-2112