Fixed object scaling hard-coding issues