Fix issues #676, #668, #694

Fix #676, #668 and #694 plus minor fixes on Propel commands.