Fixed some "issues".

XFL03, you know :P