Apa's fixes