Updated to remove Java warnings