More general fixes, added old excuses.