* Fix issues from previous commit