Remove a few more hardcodings