Fixes All Around :)