LPS-51375, LPS-51274

Hey @brianchandotcom,

Attached is an update for http://issues.liferay.com/browse/LPS-51375 and https://issues.liferay.com/browse/LPS-51274.

Please let me know if you have any questions.  Thanks!