various tweaks to satisfy istanbul