Sort out last bits