Fixes and improves propel integration