Albert fixes - add wait for