fixed few compile issues