fixes for fatal error