Fixes, fixes and more fixes. xD