some small fixes for a2