Couple specific bugfixes