DEV: More casting changes