Bug fixes, undefined should not be a string