Trivial changes.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixed assertion based on 83bff8f commit

Signed-off-by: crynobone <crynobone@gmail.com>
Minor update

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'develop'