Misc touchups/fixes