Merge pulls #1514 and #1544, fix language issues