[STABLE] Minor Patch

Small fixes and a few things added here and there. This does not have
any new content introduced.