a-few-fixes