Just some smaller bug fixes