Minor config function fixes