Minor Fixes, Thanks Xxsupr