Bug fixes #codemonkey