Minor updates, fixes to actions functionality