Fixed cast usages