Fixed function calls for shift related functions