Fixed a couple of issues with bCreative #BFUN-4 fixed