Senen App Code v1.21 minor fixes