Fixes for startup issues #1542 and #1543