Fix both a bug in get* and an error during merge