Fixes for quick api inclusion