Fixes, fixes, and more fixes