Fixed implicit conversion from String to Integer issues