some minor custom activity fixes