Fixing wickedOne's bugs.