fixed unexpected build issues