BigChick: Patch 181

Minor fixes