Fixed issues with interactive actions