Base: Small bug fixes and additional comments