Cleaned up some minor bind issues
Added constness to result data