fixes for --embedded