Some Additional fixes to user Actions