Closes #543. Closes #544.

#543
#544