Fixing bugs all over da place