fixes for $