Action fixes for android