AUI-1576, AUI-1569

Hey @eduardolundgren,

Attached is an update for https://issues.liferay.com/browse/AUI-1576 and https://issues.liferay.com/browse/AUI-1569

Please let me know if you have any questions.  Thanks!