Fix miscellaneous