fixing build / release issues