Fixes for ANSI