Base: Small bug fixes and improvements