Small updates to getters and setters.