Fixes #1430
Fixes #1448
Fix this craziness
Fixes #1444
Port Fixes #1413