Fixing apply assignment issues