Fix issues (Yes, seriously)