fixes for a/r